Remove hardcoded asset paths
Update unit tests